From 45d641e686465a6d73eacf0fc3861f44be9d600b Mon Sep 17 00:00:00 2001
From: tsteven4 <13596209+tsteven4@users.noreply.github.com>
Date: Fri, 24 Apr 2020 09:48:42 -0600
Subject: [PATCH] migrate advanced travis build to focal. (#546)

and fix a new clazy warning.  This warning shows up on focal
with clazy 1.6, but not on eoan with clazy 1.5.
---
 .travis.yml                                 | 2 +-
 tools/{Dockerfile_eoan => Dockerfile_focal} | 2 +-
 util.cc                                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename tools/{Dockerfile_eoan => Dockerfile_focal} (99%)

diff --git a/.travis.yml b/.travis.yml
index 10526f7ad..9ef722c30 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ jobs:
       compiler: gcc
       env:
         - BUILD_TYPE="docker"
-        - DOCKER_IMG="eoan"
+        - DOCKER_IMG="focal"
         - DOCKER_SCRIPT="./tools/build_extra_tests"
     - os: linux
       dist: xenial
diff --git a/tools/Dockerfile_eoan b/tools/Dockerfile_focal
similarity index 99%
rename from tools/Dockerfile_eoan
rename to tools/Dockerfile_focal
index 688180236..dcfb48a14 100644
--- a/tools/Dockerfile_eoan
+++ b/tools/Dockerfile_focal
@@ -1,6 +1,6 @@
 # this file is used to build the image gpsbabel_build_environment used by travis.
 
-FROM ubuntu:eoan
+FROM ubuntu:focal
 
 LABEL maintainer="https://github.com/tsteven4"
 
diff --git a/util.cc b/util.cc
index 0174ef782..b93c38d2d 100644
--- a/util.cc
+++ b/util.cc
@@ -1774,7 +1774,7 @@ void list_timezones()
   };
   std::sort(zoneids.begin(), zoneids.end(), alpha);
   Warning() << "Available timezones are:";
-  for (const auto& id : zoneids) {
+  for (const auto& id : qAsConst(zoneids)) {
     Warning() << id;
   }
 }
-- 
2.30.2